From 5a5ffdecfa009d2f5cc8e8b3005b3bb4b3f1094a Mon Sep 17 00:00:00 2001 From: "tw275@labyrinth.cl.cam.ac.uk" Date: Tue, 20 Jul 2004 11:04:29 +0000 Subject: [PATCH] bitkeeper revision 1.1108.5.2 (40fcfc3d1HOefeaUA-YZdx66NSVvqA) Trying to get my new web interfae to install correctly --- .rootkeys | 2 -- tools/python/setup.py | 1 + tools/python/xen/xend/sv/HTMLBase.py | 9 +++------ tools/python/xen/xend/sv/inc/bottom.htm | 2 -- tools/python/xen/xend/sv/inc/top.htm | 8 -------- 5 files changed, 4 insertions(+), 18 deletions(-) delete mode 100755 tools/python/xen/xend/sv/inc/bottom.htm delete mode 100755 tools/python/xen/xend/sv/inc/top.htm diff --git a/.rootkeys b/.rootkeys index 40189aedaa..a0d47907cd 100644 --- a/.rootkeys +++ b/.rootkeys @@ -390,9 +390,7 @@ 40fcefb3dgsa24WLk_BJeYQHrDLuOg tools/python/xen/xend/sv/images/seperator-right-highlight.jpg 40fcefb3FtiX4Pd2kT8wDlp8u8xRhQ tools/python/xen/xend/sv/images/seperator.jpg 40fcefb3yMSrZvApO9ToIi-iQwnchA tools/python/xen/xend/sv/images/xen.png -40fcefb310mW7U0p7JMoBQVnjf76xg tools/python/xen/xend/sv/inc/bottom.htm 40fcefb3zGC9XNBkSwTEobCoq8YClA tools/python/xen/xend/sv/inc/style.css -40fcefb4oxovdYkUvExZSkHN0cy_Ow tools/python/xen/xend/sv/inc/top.htm 40fcefb4rnaZNjqsBu7A5V2rlLyqRw tools/python/xen/xend/sv/util.py 40c9c469LNxLVizOUpOjEaTKKCm8Aw tools/python/xen/xend/sxp.py 40d05079aFRp6NQdo5wIh5Ly31c0cg tools/python/xen/xm/__init__.py diff --git a/tools/python/setup.py b/tools/python/setup.py index 93e7cad00c..d36f9177b9 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -41,6 +41,7 @@ setup(name = 'xen', 'xen.util', 'xen.xend', 'xen.xend.server', + 'xen.xend.sv', 'xen.xm', ], ext_package = "xen.lowlevel", diff --git a/tools/python/xen/xend/sv/HTMLBase.py b/tools/python/xen/xend/sv/HTMLBase.py index da8c03b366..e127dedac6 100755 --- a/tools/python/xen/xend/sv/HTMLBase.py +++ b/tools/python/xen/xend/sv/HTMLBase.py @@ -4,8 +4,6 @@ from twisted.internet import reactor class HTMLBase( resource.Resource ): isLeaf = True - - defaultPath = "/usr/lib/python2.2/site-packages/xen/xend/sv/" def __init__( self ): resource.Resource.__init__(self) @@ -22,9 +20,8 @@ class HTMLBase( resource.Resource ): request.write( "BODY" ) def write_TOP( self, request ): - f = open( self.defaultPath + 'inc/top.htm', 'r' ) - request.write( f.read() ) + request.write( 'Xen' ) + request.write( '' ) def write_BOTTOM( self, request ): - f = open( self.defaultPath + 'inc/bottom.htm', 'r' ) - request.write( f.read() ) \ No newline at end of file + request.write( "" ) \ No newline at end of file diff --git a/tools/python/xen/xend/sv/inc/bottom.htm b/tools/python/xen/xend/sv/inc/bottom.htm deleted file mode 100755 index 4d4a7e5285..0000000000 --- a/tools/python/xen/xend/sv/inc/bottom.htm +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/tools/python/xen/xend/sv/inc/top.htm b/tools/python/xen/xend/sv/inc/top.htm deleted file mode 100755 index ace62cb6bd..0000000000 --- a/tools/python/xen/xend/sv/inc/top.htm +++ /dev/null @@ -1,8 +0,0 @@ - - - - Xen - - - - \ No newline at end of file -- 2.30.2